(popup-menu): If the user refuses to select

from a menu, don't try to invoke the menu.

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 7f7f446d7240ce5efa18ad156cd0a71247cf7226..192107a55f2cd88b8557db23aeb47f58f0a1c0ab 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -90,7 +90,9 @@ PREFIX is the prefix argument (if any) to pass to the command."
       (message "")
       ;; Maybe try again but with the submap.
       (setq map (if (keymapp cmd) cmd)))
-    (when (functionp cmd)
+    ;; If the user did not cancel by refusing to select,
+    ;; and if the result is a command, run it.
+    (when (and (null map) (commandp cmd))
       (setq prefix-arg prefix)
       ;; `setup-specified-language-environment', for instance,
       ;; expects this to be set from a menu keymap.